-

diff --cc CONTRIBUTE
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/net/shr.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/lisp.h
Simple merge